Merge git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Thu, 5 Nov 2015 12:46:37 +0000 (07:46 -0500)
committerTom Rini <[email protected]>
Thu, 5 Nov 2015 12:46:37 +0000 (07:46 -0500)

Trivial merge